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

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

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