Merge "Adjust OWNERS to reflect new ownership" am: 56cec99389 am: 70d637c47c am: 917461172b

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

Change-Id: I17dfdc4ece1f3656a30e62c0182b56bd396eeeea