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