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