Merge "Merge "Adjust divider when IME height is changed." into nyc-dev am:...
Merge "Merge "Adjust divider when IME height is changed." into nyc-dev am: 36d1296c am: 33208571" into nyc-mr1-dev-plus-aosp
am: 08b22534
* commit '08b22534':
Change-Id: I048d0cb92f6750f69977060a2cb0c3beb67523c3