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

* commit 'adc14026fbd21d5238a47f402c7b316a7aeac92e':
  Fix 3381660: Make modifier keys in PasswordUnlock match IME