Merge "Fixes issues with multiple ringer rows (which also addresses a few...

Merge "Fixes issues with multiple ringer rows (which also addresses a few RTL/landscape issues)." into sc-dev am: b3ca17a2 am: 957b3e34 am: e44affc0

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

Change-Id: If9d6aeb7e458ea9057fef65393c439596bf6c609