[automerger skipped] Merge "[Settings] Fix RTL issue of Calls and SMS" into...

[automerger skipped] Merge "[Settings] Fix RTL issue of Calls and SMS" into sc-qpr1-dev am: 0fa8c951 am: 289bdbe5 -s ours am: 7ea24a57 -s ours

am skip reason: Merged-In I022253efbe0ea25f11d5ac6c2b3b0fcd1d9f54aa with SHA-1 95bcd7cb is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15542135

Change-Id: Ifea9163c3e42fd5318a0778695cc54fa2f35b447