Merge "AutoSize TextView - API polish - no RuntimeException in signature" into oc-dev
am: 635d9dd864

Change-Id: Ic11450a566051ca63f3b65e60c70e8da4d1cef11