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

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

Change-Id: Ic61d1bb175b1ba46b7df308af36e76b596a9b61e