Merge "Fix SecurityException when calling DevicePolicyManager.setMaximumTimeToLock"