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

[automerger skipped] Merge "Update permissions for ServiceState broadcast" into sc-dev am: cc16c917 am: a05e799f -s ours am: 90afd87b -s ours

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

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

Change-Id: I1765597beaacd2c05012748f2bb48568e8ebc315