Merge "Update permissions for ServiceState broadcast" into sc-dev am: cc16c9178b

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

Change-Id: Idb6c2c4d49d923fa981fa37712d2febef15593c6