[automerger skipped] Update ServiceState broadcast for location permissions...

[automerger skipped] Update ServiceState broadcast for location permissions am: ac5f03c0 -s ours am: a6c9b8f2 -s ours am: f7e1ba0f -s ours am: bbf8dbec -s ours

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

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



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