Merge "Merge "Move ImeAwareTextEdit from Settings to android.widget" into rvc-dev am: d3b000ca am: eb284a2b" into rvc-d1-dev-plus-aosp