Merge "Add new DPM permissions required by DeviceLock role."