Merge "VolumeDialogImpl: Respect multiple visible rows in landscape" am: ef9dfbfa4a am: 82130c3a9f

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

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