Merge "Adjust OWNERS to reflect new ownership" am: ead9d53764 am: 81115930fa

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

Change-Id: Ifba51b22f47f52aa1716dfbc621fb311a3865bba