Merge "VolumeDialogImpl: Respect multiple visible rows in landscape" am: ef9dfbfa4a am: 82130c3a9f am: 32cd7265d5 am: 38a0173464

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

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