Merge "FaceService - call PermissionEnforcer helper on methods annotated with @EnforcePermission"

services/core/java/com/android/server/biometrics/sensors/face/FaceService.java

@@ -200,6 +200,8 @@ public class FaceService extends SystemService {
         @android.annotation.EnforcePermission(android.Manifest.permission.USE_BIOMETRIC_INTERNAL)
         @Override
         public void scheduleWatchdog() {
+            super.scheduleWatchdog_enforcePermission();
+
             final Pair<Integer, ServiceProvider> provider = mRegistry.getSingleProvider();
             if (provider == null) {
                 Slog.w(TAG, "Null provider for scheduling watchdog");