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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5ce1a488245ace43382c0e53a2bdd146e111cf6c