Merge "Update ServiceState broadcast for location permissions" into sc-dev am: 0d2e7006

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



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