Merge "Prevent KeyguardContainer size from shrinking when switching from...
Merge "Prevent KeyguardContainer size from shrinking when switching from Password Security Challenge." into rvc-dev am: 966f168a am: 34f9d4c5
Change-Id: If04f3bf237159ee5a4aaf653029b99bff2a972d0