Merge "Allow renounce location permission" am: 373b687d96

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

Change-Id: I66e12d38d50dcf48685c86468462e3b9605c360b