Merge "Introduce TextView attribute for control justification." into oc-dev am: 31eeb08bdb
am: e7c2e03d22

Change-Id: I276206b9bff862e8147339e77e77faeb1a938f97