Merge "Add more OWNERS coverage" am: a40fbcd94c am: 018eaf4357 am: 19840369e1

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

Change-Id: I0475257e967bf380f3e12cca62eaf4e094442204