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

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

Change-Id: I17bc6f71b8badc71582a27033c1dad28737441c7