Merge "Merge "Move ImeAwareTextEdit from Settings to android.widget" into rvc-dev am: d3b000cafe am: eb284a2bcb" into rvc-d1-dev-plus-aosp am: 926a74b828
Change-Id: I2dc34f45aa8378802116cf0b55f26ca86fceadb4
This commit is contained in: