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

Change-Id: I6054c0ca458a246dc6ce2b831ecee01b0f6975ce