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

[automerger skipped] [conflict] Merge "Update ServiceState broadcast for location permissions" into sc-dev am: 0d2e7006 am: 547648c2 -s ours am: a2c2b987 -s ours am: d6dffa9f -s ours am: b062ef50 -s ours am: 464714e9 -s ours am: 8f993ade -s ours

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

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



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