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

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

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