Merge "Remove hridya@ from OWNERS file" am: 0b0493c73f am: f712139aaf am: d423092fec am: bdff26b364

Original change: https://android-review.googlesource.com/c/platform/system/tools/mkbootimg/+/1940794

Change-Id: I503607eb3c49a46f90675982cd1ac358066142c5