Merge "Add janitors to the OWNERS file" into main am: 24f8a37c93 am: 22535836b1

Original change: https://android-review.googlesource.com/c/platform/external/bsdiff/+/3423245

Change-Id: Ib20471a879b00f8f42a1421f048621b3aeed57bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>