Merge "Let admin disable fingerprint for the work challenge" into nyc-dev

diff --cc services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
index 1cd5635,65ce55e..9e8a21c
--- 1/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
--- 2/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@@ -273,10 -276,8 +278,10 @@@ public class DevicePolicyManagerServic
  
      /** Keyguard features that are allowed to be set on a managed profile */
      private static final int PROFILE_KEYGUARD_FEATURES =
-             PROFILE_KEYGUARD_FEATURES_AFFECT_OWNER | PROFILE_KEYGUARD_FEATURES_AFFECT_PROFILE;
+             PROFILE_KEYGUARD_FEATURES_AFFECT_OWNER | PROFILE_KEYGUARD_FEATURES_PROFILE_ONLY;
  
 +    private static final int DEVICE_ADMIN_DEACTIVATE_TIMEOUT = 10000;
 +
      final Context mContext;
      final Injector mInjector;
      final IPackageManager mIPackageManager;