Merge "Fix 3296883: Hide PIN characters in ChooseLockPassword" into honeycomb