Merge "[Overlay] Adjust Media Controls button size and position" into...

Merge "[Overlay] Adjust Media Controls button size and position" into tm-qpr-dev am: f536c320 am: 00c5748d am: 241d2044 am: 6f278d5f

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



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