[automerger skipped] Merge "Protect broadcast for CHECK_MUSIC_ACTIVE" into...

[automerger skipped] Merge "Protect broadcast for CHECK_MUSIC_ACTIVE" into tm-qpr-dev am: c9446dc8 am: 3511eb54 -s ours

am skip reason: Merged-In Ide644bd88d6c8a77961dd3aa558e1d51f763f9c4 with SHA-1 84c77b43 is already in history

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



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