Merge "Require permission for hidden APIs in BiometricPrompt" into udc-qpr-dev