Merge "Add new permission UPDATE_DEVICE_MANAGEMENT_RESOURCES"