[automerger skipped] Merge "Allow Background Location Access for Shell" am:...

[automerger skipped] Merge "Allow Background Location Access for Shell" am: 6e1b51a9 am: ca5aa7df -s ours am: b1ab8be7 -s ours am: 1fe0bcad -s ours am: a9e15a6a -s ours

am skip reason: Change-Id Iba3fcb3a43c5df3c30dadf6b7733eaee03d1d0e3 with SHA-1 89796d49 is in history

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

Change-Id: Ib1de216309973bc81850918c9fb113b8e01b6afb