Merge "Update media play/pause containers" into tm-qpr-dev am: eaa52a46 am: 0b7b0367

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



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