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: ba10c228

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

Change-Id: I6640811ee69f1afd18a74763421265fb76277b6a