Merge "Add more OWNERS coverage" am: a40fbcd94c

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

Change-Id: I671d7008e835b06f00a6f3b521035afb2e5dfe10