Merge "Move ImeAwareTextEdit from Settings to android.widget" into rvc-dev am: d3b000ca am: 04ef13f4 am: 09b1d5d5 Change-Id: Ie26e8b0584e22e80a9f5eae52e068126f202f49c