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: 96357025
Change-Id: Ia9afd4c90cfe9256b499a05867f2e3320f09fc44