Merge "Fix malformed OWNERS." am: b460d47489 am: 7a8b3a140e am: dfba9408c0 am: 8977bd2b81

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

Change-Id: I437a81f4fda887fd89cf22b1b16cb8d942f0275e