Merge "Fix IME adjustment for voice interaction windows am: 4b74f4d am: 22ac9fe" into nyc-mr1-dev-plus-aosp
am: 2e83954

* commit '2e83954bd7385a2fe84d015268eedad520535364':

Change-Id: I940c4d7eb5f49fb9ce7cc4843d6c0b52a2612d2a