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

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

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



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