Merge "renounce location permission for service state callback" into tm-dev am: 6851d6c653 am: e67d70914c

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

Change-Id: Iada3c50b86f411a138879806020caccb03eca277
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>