Merge "Allow renounce permission" am: 3ea3e3b73c am: 4f69730598 am: 8bf22dda1b

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1887531

Change-Id: I18a34e18aac0a52c73fba0a862e7c99cbe722c98