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

[automerger skipped] Merge "Update ServiceState broadcast for location permissions" into tm-dev am: dfada27e am: cd1afd12 am: 5ce0f57d am: 781e828f -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: I6ae333105423f174b4c19173f2fc23563c4c16f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>