Merge "Enable IME on Keyguard Password security challenge" into rvc-dev am: 965b250bc1

Change-Id: Iff3d814b9f1183d73ff2744f981d2c2199835ed9