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

Change-Id: I81b1bd560ed319f52bde2eeecc7bbb555f9b7402