[automerger skipped] Merge "Allow Background Location Access for Shell" am: 6e1b51a9d9 am: ca5aa7dfec -s ours
am skip reason: Change-Id Iba3fcb3a43c5df3c30dadf6b7733eaee03d1d0e3 with SHA-1 89796d4936 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1344377
Change-Id: Ice59c20f918e2d7419d2d302b00582d9f15e99ad
This commit is contained in: