Merge "Merge "Fixed the text alignment with RTL text" into oc-dr1-dev am:...
Merge "Merge "Fixed the text alignment with RTL text" into oc-dr1-dev am: 19821880" into oc-dr1-dev-plus-aosp
am: 43f98923
Change-Id: Id4b3af10ed5ccbd1eefbd2c735c66ac38962319f