Merge "Enable IME on Keyguard Password security challenge" into rvc-dev am: 965b250b am: c3be4b99 Change-Id: Ib1cb4b99466b8984ca69d4aa329e023dad4effd4