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

Change-Id: I7db082275a2a85229a7cc4014d580e9997cac82d