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

[automerger skipped] Merge "Update ServiceState broadcast for location permissions" into tm-dev am: dfada27e am: d50c22f9 -s ours

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

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



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