Merge "Merge "Fix IME for status bar in docked mode" into nyc-dev am: 93536af5...
Merge "Merge "Fix IME for status bar in docked mode" into nyc-dev am: 93536af5 am: d065af80" into nyc-mr1-dev-plus-aosp
am: 54256ef7
* commit '54256ef7':
Change-Id: I385e9f8ded03b7d5141984f808daefde5f0ca946