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: I5cced135122018628704a68de5a3df7a8cf7d8cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>