[automerger skipped] Merge "Update ServiceState broadcast for location...

[automerger skipped] Merge "Update ServiceState broadcast for location permissions" into sc-v2-dev am: de189814 -s ours am: 3597e174 -s ours am: ac856915 -s ours am: 105a07e0 -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: I12d389c7d0f5612c34746c79d0e9ee69a23614f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>