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 am: f5b6e17c
Change-Id: Ie17f615443400c01e630173d6f1b388321d1c175