[automerger skipped] Merge "Media - Leave playing media in QS" into...

[automerger skipped] Merge "Media - Leave playing media in QS" into rvc-qpr-dev am: 0766cdc0 am: 4f8a8f68 -s ours

am skip reason: Change-Id Ia7c9a8d9b100506f2c12ef2d14e4a952e151bd05 with SHA-1 11a332b7 is in history

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

Change-Id: Ia937b417eb2d91b547e527228aaa0f9fb0dbc546