Merge "AutoSize TextView - upgrade CTS testAutoSizeCallers_setMaxLines"