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

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

Change-Id: Ic31ceac3f156fde0b9e45e929e7e723a02d423ab