Merge "Allow power button to close an input method am: d28e907183 am: 8da4ced46c" into nyc-mr2-dev-plus-aosp