Merge "Fix malformed OWNERS." am: 37ef4e0be3 am: 6ecdbeb992 am: 428f6b01c2

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

Change-Id: I21174bf9a885e93416852d9a60a33e2d789dcc65