[automerger skipped] Merge "Allow renounce location permission" am: 373b687d...

[automerger skipped] Merge "Allow renounce location permission" am: 373b687d am: 9bb03ffe am: 61569b39 am: 9fe54e87 -s ours

am skip reason: Merged-In I10872f34603441da2cf80f1f2976f3f3ca0ff6c2 with SHA-1 1e7a4169 is already in history

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

Change-Id: I0e09d2f36d256464c7bb5c251c88862c763ecbd7