Merge "Enable IME on Keyguard Password security challenge" into rvc-dev am: 965b250b am: 84743e94 Change-Id: Ia972f7a35d5b8e2e873e7885887a6d081f0db2d8