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: Iaa4f328bd4fa37f7399c588d1213471ba29f0954