Merge "Fix malformed OWNERS." am: b460d47489 am: 7a8b3a140e

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1495947

Change-Id: I7505d04a6714d3829728e136b3fe9682d741461c