Merge "Merge "setTransformationMethod should reset mTextDir" into nyc-dev am: df9dee869c am: 214ebfb532" into nyc-mr1-dev-plus-aosp