Merge "Allow renounce location permission" am: 373b687d96 am: 9bb03ffe7c

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

Change-Id: I1f8a4b7f8e4774a780b18cb9c6475293ea706f37