[automerger skipped] Update ServiceState broadcast for location permissions am: ac5f03c07f -s ours

am skip reason: Merged-In I9784527d6d79235830f562c1944562f5a6ac1fb3 with SHA-1 99448eb2ae is already in history

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

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