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

Change-Id: I224e35a6dcb59a99500e8903f90d9b9a66a64360