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

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

Change-Id: I9af82e5d7dc806ffc42122e0849cbf854c220fde