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

Change-Id: I471b02827aa7b67b95e18a7958d372ac2e12c7f8