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