Merge "Merge "Fix RTL in controls and GA" into rvc-dev am: c04b1628 am:...

Merge "Merge "Fix RTL in controls and GA" into rvc-dev am: c04b1628 am: 0247278f am: 684e5524" into rvc-qpr-dev-plus-aosp am: de6d1368

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

Change-Id: I6a86f739d10c20496569017a52891003b805518e