Merge "Fix media landscape buttons and layout" into tm-qpr-dev am: 62097f8f83

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

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