Merge changes Ic26e47c1,I6c9717d1

* changes:
  Check foreground and appOps for BiometricPrompt#authenticate
  Update authentication when encrypted or lockout