[automerger skipped] Fix EditText show wrong position when ime show am: 6d1eca3c85
am: d2d52d2c3e  -s ours

Change-Id: I74164b4363a3248d38d3e4eda928aed2b41e2413