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

Change-Id: Ibe54c07e318a61d7a8a512a8c2e6cd97f920493c