Merge "Fix "max failed login attempts" disclosure" into oc-dr1-dev am: 262aacd353

am: cfc3ccdb82

Change-Id: I2c73cf6895da1188027d0f8704f795490f1e7be1

src/com/android/settings/enterprise/DevicePolicyManagerWrapperImpl.java

@@ -42,6 +42,11 @@ public class DevicePolicyManagerWrapperImpl implements DevicePolicyManagerWrappe
         return mDpm.getMaximumFailedPasswordsForWipe(admin, userHandle);
     }
 
+    @Override
+    public ComponentName getDeviceOwnerComponentOnCallingUser() {
+        return mDpm.getDeviceOwnerComponentOnCallingUser();
+    }
+
     @Override
     public ComponentName getDeviceOwnerComponentOnAnyUser() {
         return mDpm.getDeviceOwnerComponentOnAnyUser();