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

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

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