Merge "Add GET_DEVICE_LOCK_ENROLLMENT_TYPE permission for DeviceLockManager.getEnrollmentType" into main