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

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



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