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

[automerger skipped] Merge "Update ServiceState broadcast for location permissions" into tm-dev am: dfada27e am: 64bc1507 -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/+/18214219



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