Merge "Move ImeAwareTextEdit from Settings to android.widget" into rvc-dev am: d3b000cafe

Change-Id: Ie48dca1a7a63287f49707bcbea90ffc388cb2486