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

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

Change-Id: I6e7668dd2b562b344b4a9d247ec7dc7acc4e2751