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

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

Change-Id: I46e864c75c6ab4100444610f8c5a239466abc5a5