Merge changes from topic "lockoutreset" into rvc-dev

* changes:
  Add missing permission check for addLockoutResetCallback
  Add null pointer check for addLockoutResetCallback

services/core/java/com/android/server/biometrics/BiometricServiceBase.java

@@ -978,6 +978,10 @@ public abstract class BiometricServiceBase extends SystemService
     }
 
     protected void addLockoutResetCallback(IBiometricServiceLockoutResetCallback callback) {
+        if (callback == null) {
+            Slog.w(getTag(), "Null LockoutResetCallback");
+            return;
+        }
         mHandler.post(() -> {
            final LockoutResetMonitor monitor = new LockoutResetMonitor(callback);
            if (!mLockoutMonitors.contains(monitor)) {

services/core/java/com/android/server/biometrics/fingerprint/FingerprintService.java

@@ -330,6 +330,7 @@ public class FingerprintService extends BiometricServiceBase {
         @Override
         public void addLockoutResetCallback(final IBiometricServiceLockoutResetCallback callback)
                 throws RemoteException {
+            checkPermission(USE_BIOMETRIC_INTERNAL);
             FingerprintService.super.addLockoutResetCallback(callback);
         }