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