Merge "Revert "Allow power button to close an input method"" into nyc-mr2-dev am: 6e5ff8a87d
am: 4566d01f67

Change-Id: Ibb37c82924fdc61a00c8963568a8e9422ebfe173