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

[automerger skipped] Merge "Update permissions for ServiceState broadcast" into sc-dev am: cc16c917 am: 4e51e85e am: f40095f0 am: 7c11e556 -s ours am: 837736b6 -s ours

am skip reason: Merged-In Ibfa66624a4157b7c2c7d764e2b6bdb26ac5f1447 with SHA-1 8bfc5315 is already in history

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

Change-Id: I573b19e3cc273ade129b4ec5b4a0d5cde0bb2af2