[automerger skipped] Merge "Update ServiceState broadcast for location permissions" into sc-dev am: 0d2e7006ce am: 93f9dfff6c -s ours
am skip reason: Merged-In I9784527d6d79235830f562c1944562f5a6ac1fb3 with SHA-1 f8e793e6ed is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18297726
Change-Id: I73e613f92427d37bd63ecea01ec2ea70585ebd8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: