Merge "Move ImeAwareTextEdit from Settings to android.widget" into rvc-dev am: d3b000ca am: eb284a2b Change-Id: I741f184edf53ce40c5a4f6b999e9aa0f91cb41b0