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

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

Change-Id: I572761a225825cf6bb55ea8f0527699454553be8