Merge "Fix display of BiometricPrompt wipe warning dialogs" into rvc-dev am: 8c28971e am: 7fbf5e00 am: e57d2671 Change-Id: Ie95808c4895d07f415085fc111d43995838f1953