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

[automerger skipped] Merge "Update ServiceState broadcast for location permissions" into sc-dev am: 0d2e7006 am: 93f9dfff -s ours am: 40d3ec8c -s ours

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

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



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