[automerger skipped] Merge "allow renounce location permission" am: 5aa636d3...

[automerger skipped] Merge "allow renounce location permission" am: 5aa636d3 am: 990698de am: d1b1718e am: 90868c77 -s ours

am skip reason: Merged-In If5580b4a3d24cb8dd4e0f84991d41358a94ca059 with SHA-1 a338a1a5 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1887651

Change-Id: Ice831d58391507abb0758368269b9f973044b581