Merge "AutoSize TextView - take horizontalScrolling into account [CTS]" into oc-dev
am: 044820ec5f

Change-Id: Iaec98c7b8535b76c3826355f1e090ba88d0c4393