Merge "Change lock-task DPM authorization to packages"