Merge "Fix 3381660: Make modifier keys in PasswordUnlock match IME" into honeycomb