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

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

Change-Id: Ic0a2565f23be69bd573d0ba4bb6cd19fa5eb46d9