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