Merge "Merge "Prevent KeyguardContainer size from shrinking when switching...
Merge "Merge "Prevent KeyguardContainer size from shrinking when switching from Password Security Challenge." into rvc-dev am: 966f168a am: 96357025" into rvc-d1-dev-plus-aosp