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

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



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