[conflict] Merge "Update ServiceState broadcast for location permissions" into sc-dev am: 0d2e7006ce

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

Bug: 232399715
Change-Id: I04b29b3875451e822ce1f37fcace9be31669f625
Merged-In: I9784527d6d79235830f562c1944562f5a6ac1fb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>