Merge "Add parent check on DevicePolicyManager.isSafeOperation()" into sc-dev