Merge "Update B+R OWNERS file" into main am: 3a2e9e0827 am: 3640dbe54e

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3000556

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