Merge "Make BiometricPrompt credential UI closer to Settings" into rvc-dev am: c2ba1873e6 am: 650ccb5593

Change-Id: Ia3b4b8fb38b874b220a5c62d42ee727a6fcd3572