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

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

Change-Id: Ic586115a62c992c859368d06e869ff596ee8c417