Merge "Update ServiceState broadcast for location permissions" into tm-dev am: dfada27e

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



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