Merge "aabhinav@ leaves BR OWNERS." am: 779b5f6308 am: 3858d8f505

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

Change-Id: Ia3b2877fc73a821a0d64151e0143f235d7a52740