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

Change-Id: I815edcb99010bfc0944cf0f8c9f100a7e3c0b4d8