Merge "Update OWNERS." am: bfc5088c1d am: a2ddc936eb

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

Change-Id: I5b712798299b03e33ebf45d5b8532ec894be6fae