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

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

Change-Id: Ifde40b91f0870d862a2f513e44a31ae30c0974ae