Merge "Location OWNERS updates" am: 2e8693718c am: c02e647603 am: c568376083

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic48a74d51cf700cf8c737c27cd8f94b6ac25d404